From: Joakim Verona <joakim@verona.se>
Date: Wed, 11 Sep 2013 08:37:10 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=9bdba396e40b4461b78d3fbf8620d6b61004bf39;p=emacs.git

merge from trunk
---

9bdba396e40b4461b78d3fbf8620d6b61004bf39